Merge with tip
authorAlastair Tse <atse@xensource.com>
Thu, 2 Nov 2006 14:27:16 +0000 (14:27 +0000)
committerAlastair Tse <atse@xensource.com>
Thu, 2 Nov 2006 14:27:16 +0000 (14:27 +0000)
commit147350e8433c6dfb5750b34a9a598bcb6e17b2e0
tree48253fd25bc727c2c74d6acabd09c88fff75cae8
parentdfce37614dc446860225e7a83957973369f7aadf
parent16a92870544084629b135e98b356f5ad7d943243
Merge with tip